Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: conflicts between shell and shell-example #670

Merged
merged 1 commit into from
Aug 8, 2024

Conversation

tsic404
Copy link
Contributor

@tsic404 tsic404 commented Aug 8, 2024

log: as title

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: BLumia, tsic404

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-bot
Copy link

deepin-bot bot commented Aug 8, 2024

TAG Bot

New tag: 0.0.35
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #666

@deepin-ci-robot
Copy link

deepin pr auto review

关键摘要:

  • 代码中移除了org.deepin.ds.dock.power.json配置文件,但未提供替代方案或说明原因。
  • 配置文件路径已更改,确保新的路径正确且文件已正确安装。

是否建议立即修改:

  • 是,需要提供移除org.deepin.ds.dock.power.json配置文件的原因,并确保新的路径是正确的。同时,应该检查是否有其他文件或配置依赖于这个文件,以避免潜在的功能缺失。

@yixinshark
Copy link
Contributor

/forcemerge

@deepin-bot
Copy link

deepin-bot bot commented Aug 8, 2024

This pr force merged! (status: blocked)

@deepin-bot deepin-bot bot merged commit c1fe174 into linuxdeepin:master Aug 8, 2024
7 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants